[33mcommit 5b231d2c17e1892bed727e197e100049be95f544[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Dec 12 05:19:55 2016 +0100

    Do not run convert-usrmerge on NFS systems
    
    Closes: #842145

[33mcommit d5ae406c8303b6fa26b13678879ff7626391eb59[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Dec 12 04:31:20 2016 +0100

    Add a versioned conflict with libjson-c-dev
    
    See #843145.

[33mcommit e19af0352b68ff7318745187b1e2204c1958e6ce[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Dec 12 04:20:22 2016 +0100

    Add a version number to the conflict with elvis-tiny
    
    See #813857.

[33mcommit 253b84a36084f30e83b18216c618131b978305f4[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:46:14 2016 +0200

    Debian changelog for 12

[33mcommit 84c5f497ac877538fbb533ee5f688b4e64b2680c[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:46:01 2016 +0200

    debian/control: update the policy version

[33mcommit d7e7faac4bd105483fe73d3834ad25d2dcec9ac8[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:40:43 2016 +0200

    Add a conflict with molly-guard
    
    Closes: #837925

[33mcommit 24fde03ea40717a7a78dedc59554469f77f7914d[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:38:02 2016 +0200

    New debconf translation: pt_BR
    
    Closes: #829342

[33mcommit dc4a7c5026c19e8df94d12a8011a9a80f8fb64dc[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:36:18 2016 +0200

    New debconf translation: nl
    
    Closes: #823443

[33mcommit 1e51b26d1b2a1398c7ad041edb51a94169f261a7[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:33:16 2016 +0200

    New debconf translation: de
    
    Closes: #818656

[33mcommit 7adb0539251a2915f17ba189610be5a33a081cd4[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:31:27 2016 +0200

    New debconf translation: pt
    
    Closes: #818636

[33mcommit 471c8f3385e0f751fe15c497d9ca4c23e1bcf998[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Sep 29 18:19:58 2016 +0200

    Update the versioned conflict with zsh
    
    See #824205.

[33mcommit 7ebfb3d6552b96bcdda077a2e76637167daeb580[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Mar 16 07:32:09 2016 +0100

    Debian changelog for 11

[33mcommit 40ce6d8b5ef0b3591055261d09c779d9a080a201[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Mar 15 09:07:07 2016 +0100

    Run convert-etc-shells after the file system conversion

[33mcommit 652e52817c2d5374b3feaa7ffc555542b9236c7f[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Mar 15 09:00:03 2016 +0100

    Add the convert-etc-shells program
    
    It adds to /etc/shells /usr-based paths for each shell in /.
    
    Closes: #817119

[33mcommit 67b45342a5ba3d022518c640b52e96ee691ff06e[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Mar 14 08:53:30 2016 +0100

    New debconf translation: fr
    
    Closes: #818144

[33mcommit cd804382ec0d7a0eb19c945349d50e34346515fa[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Mar 9 06:42:48 2016 +0100

    convert-usrmerge: use three-argument open

[33mcommit b08966a480eadf306b17429e101d68ec93a195f7[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Mar 5 02:09:42 2016 +0100

    dpkg.cfg: remove libpng12-0
    
    See #766809.

[33mcommit 2281dd57950119238011b66165e830064874f6af[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Feb 28 02:16:16 2016 +0100

    Debian changelog for 10

[33mcommit f5aee6d0dc52f0087e3ff041793f9d672d6098be[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Feb 28 02:01:30 2016 +0100

    Revert "dpkg.cfg: remove libpng12-0"
    
    This reverts commit 594aab027a2bfb74dfca311a21a4cd40c201858b.

[33mcommit 911efe6bae5fe0f394cf95ed6dff347b3dc32a4d[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Feb 28 01:57:03 2016 +0100

    prerm: do not fail if dpkg.cfg.d/usrmerge is empty

[33mcommit 982382315e7423bf14bbcbc126e0733a42b0462e[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Feb 18 15:40:27 2016 +0100

    dpkg.cfg: remove tcsh
    
    See #767927.

[33mcommit e872aaa4bc89284f580c23dec5e130d548e19bb9[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 17 01:15:18 2016 +0100

    debian/control: add ~ to the less version number

[33mcommit 594aab027a2bfb74dfca311a21a4cd40c201858b[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 17 01:00:51 2016 +0100

    dpkg.cfg: remove libpng12-0
    
    See #766809.

[33mcommit 98ddb28dfd5400d22381f3dc7d74c46eb491694c[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Feb 16 05:52:09 2016 +0100

    Mention "merged /usr" in the package description

[33mcommit 66e91e6568905d4fe98978056c356f433466415a[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Feb 12 03:10:21 2016 +0100

    New debconf translation: it

[33mcommit 8f003829789cfd0976be6a41c234bf09469b8ac4[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Feb 12 03:06:37 2016 +0100

    Ask with debconf if convert-usrmerge should be run
    
    Closes: #797417

[33mcommit 1ebf29c6b652191b0a8f2b6c40502cc10878985d[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Feb 12 02:44:29 2016 +0100

    Update .gitignore

[33mcommit 5a9197ab280873dea252eb424922b60b2be6d011[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Feb 11 23:46:51 2016 +0100

    dpkg.cfg: remove open-iscsi
    
    See #810276.

[33mcommit 93ae1c6a13f2d3d4a8c27dd1219639f776248a7c[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 10 06:27:22 2016 +0100

    postinst: convert the system when not already converted
    
    Even if the package is being upgraded.

[33mcommit 5f9f640bb9b2dd2009d0d3c42e57c979d2059569[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 10 05:05:08 2016 +0100

    Debian changelog for 9

[33mcommit 11aeace9a00420a4a92edeb9c8ff122710df1160[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 10 04:54:55 2016 +0100

    Add a conflict with yp-tools
    
    It installs /usr/bin/{,nis,yp}domainname, which conflict with programs
    with the same name installed in /bin/ by the hostname package.
    
    See #812532.

[33mcommit e23c50b180dd6c3f0ae889533beab926e60600f0[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 10 04:47:31 2016 +0100

    Add a conflict with elvis-tiny
    
    It installs /bin/vi which conflicts with /usr/bin/vi, a symlink managed
    by update-alternatives.
    
    See #813857.

[33mcommit ae11fb578d85833a95027f02f1a34a5346784a37[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Feb 10 04:45:27 2016 +0100

    Update the versioned conflict with xfslibs-dev
    
    The precedent release still had the useless symlinks.
    
    See #766811.

[33mcommit c6c7427eb1585ee782ddd04df417552d064cc34b[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Feb 6 23:57:10 2016 +0100

    dpkg.cfg: remove acl
    
    See #767925.

[33mcommit 14ab09b54e5c18c66cd762ab9432c50ca95c105a[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Feb 6 01:29:34 2016 +0100

    dpkg.cfg: remove musl-dev
    
    See #766812.

[33mcommit 5cac25f129bd102e8a802abe0e5caddec14e8ce4[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Feb 2 05:29:09 2016 +0100

    Add a version number to the conflict with zsh
    
    See #768079.

[33mcommit 7bbb7a9965de8f0cadf96df28ee8832305885023[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 24 23:37:03 2016 +0100

    Update the versioned conflict with davfs2
    
    The precedente release did not actually remove the installed symlinks.

[33mcommit 3664d54ba7a17e402a8d81e14a37ce65a5329065[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 24 23:35:50 2016 +0100

    Update the versioned conflict with molly-guard
    
    A similar bug was introduced again later.
    
    See #812535.

[33mcommit da411f7cb94f8101f4857a7f5542d028bac0c0d1[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 24 12:45:08 2016 +0100

    dpkg.cfg: remove policycoreutils

[33mcommit 4cff2a8895f48bc6fff57a6ea60e85ebb25274ff[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 24 12:26:25 2016 +0100

    Add a version number to the conflict with mksh
    
    See #807185.

[33mcommit 61bdd80866b6ce4e01e833b58025691084cc108f[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Jan 22 07:11:36 2016 +0100

    Debian changelog for 8

[33mcommit 7a208483fa8961169ac1e31742b17ef5c675c570[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 18 23:05:01 2016 +0100

    Add a versioned Breaks for initramfs-tools
    
    Closes: #810860

[33mcommit 7f0380c74c91696a1f49a8f6f95f6f1bd44d3080[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 18 23:02:27 2016 +0100

    dpkg.cfg: remove coreutils
    
    See #767710.

[33mcommit c3e3aa92cff6441e2aadaa7abcb6bb833621591d[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 17 23:13:34 2016 +0100

    Add a versioned Breaks for cruft-ng
    
    Closes: #811317

[33mcommit 0e4d21c657037a5900147841ab1303fa2fb7dd89[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Jan 17 06:30:42 2016 +0100

    Add a conflict with older open-vm-tools
    
    Also, remove the non-versioned conflict with open-iscsi which was added
    by mistake and is not needed because that package has a workaround in
    dpkg.cfg.
    
    See #810274.

[33mcommit aab73a5bf5699160d42bad36e18060a41142f40d[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 16 03:52:16 2016 +0100

    Debian changelog for 7

[33mcommit 6c3d1ec990f7b109b355172fa261b17043fa814b[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Jan 13 01:36:31 2016 +0100

    On EBUSY, list the services using ProtectSystem

[33mcommit 1ef00b556eba71d4255c850d4ef25b9471718e2c[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Jan 12 00:17:55 2016 +0100

    dpkg.cfg: remove less
    
    See #767928.

[33mcommit 860ffc89591927ed29229b7e91503a0175b2d0c1[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 9 23:28:38 2016 +0100

    dpkg.cfg: remove libbrlapi-dev
    
    See #766810.

[33mcommit d6a042ac32e6b2cb47e8cc86d3c266fefa0cee8e[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 9 04:33:39 2016 +0100

    Debian changelog for 6

[33mcommit 293720a248bab70f70e117ffc9f1da815c56d488[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 9 04:32:16 2016 +0100

    Add a conflict with open-iscsi
    
    See #810274.

[33mcommit 4ce1379135960a3dfdbdee5004a1f2d9c6626f7a[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 9 04:12:40 2016 +0100

    dpkg.cfg: add open-iscsi
    
    See #810276.

[33mcommit 53344f3311402fce0c0c811902fd36c8d3f17a76[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Jan 9 03:44:40 2016 +0100

    Check for free space before the conversion

[33mcommit e8d6368f73a2293c71d1d61d4dc9e07ad547b069[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Jan 8 14:46:23 2016 +0100

    dpkg.cfg: remove libusb-0.1-4
    
    See #766808.

[33mcommit 5cc79e63a73fdd8bad8a17e8d619a061c70cc8cf[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Jan 8 06:03:37 2016 +0100

    README.Debian: advertise tiny-initramfs

[33mcommit f061376dec0064e338be1f7ca090dfccf637d406[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 23:06:42 2016 +0100

    Add a conflict with older vsearch
    
    See #810272.

[33mcommit a1a0efb7210e8ea3314999650f14e46763d5e4c1[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 23:04:11 2016 +0100

    dpkg.cfg: remove xfsdump
    
    See #767926.

[33mcommit be73f1379b61081706dc8e0ce237ed6dab4c72c3[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 07:08:34 2016 +0100

    Add support for ppc64el to directories_to_merge()

[33mcommit ab32de3d4d3b40248a8f07f079277d0bf5462f67[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 05:00:42 2016 +0100

    dpkg.cfg: remove cryptsetup
    
    See #767921.

[33mcommit 1a5c10c945d8e5455e5a8069f2156093485b944a[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 04:50:35 2016 +0100

    dpkg.cfg: remove xfslibs-dev
    
    See #766811.

[33mcommit f4d26966c7a343c891c3a5a14855da6346dfa586[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 02:59:06 2016 +0100

    Debian changelog for 5

[33mcommit d84e09373b4348b56fd1ed855ddf83b4f3d50a2e[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Jan 7 02:50:09 2016 +0100

    Create empty multilib and multiarch library directories
    
    Closes: #810091

[33mcommit 9eef7ed46a2690707e8b54432b37f1d766dbeaf0[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Jan 6 23:41:30 2016 +0100

    dpkg.cfg: remove libdm0-dev
    
    The package is obsolete and not needed on modern systems.
    
    See #766813 and #809790.

[33mcommit d2bfacaa1cebcc8066db19095b544a1bfc8d5201[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Jan 6 17:01:43 2016 +0100

    dpkg.cfg: remove davfs2

[33mcommit 3ceb74c090c772f085e47efde17d2b8421999ea3[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Jan 6 15:05:54 2016 +0100

    Add a conflict with ksh

[33mcommit 6823e53d2fca59226681597270fcc98beae0a5cc[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 4 06:18:45 2016 +0100

    dpkg.cfg: remove kbd
    
    See #767922.

[33mcommit c9596c89f871191fdd13594f829da410a34e7534[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 4 05:13:32 2016 +0100

    Debian changelog for 4

[33mcommit 5cd149c4bc059bc730884904488c927fc3c66760[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 4 05:08:33 2016 +0100

    Fix the conversion of duplicated symlinks
    
    The program still does not handle automatically all possible combinations,
    but we only need it to work around the few buggy packages with duplicated
    symlinks.

[33mcommit e74540c8c317270152c47559d5b12934a921ab37[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 4 05:02:54 2016 +0100

    preinst: check if an initramfs is being used
    
    If so, then do not warn about a standalone /usr.
    This check only detects an initramfs created by initramfs-tools.

[33mcommit c1bec130eee5e3ef89d8bf1f3fb5ce3901acbc82[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Jan 4 05:02:14 2016 +0100

    Switch the test script from aufs to overlayfs

[33mcommit c5f30a5466292e1e9b3b5c085f38064c0e161e26[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Dec 27 14:27:25 2015 +0100

    Debian changelog for 3

[33mcommit aeab7d2366f70353086d794b2e9812a0cf6906c3[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Dec 27 13:46:11 2015 +0100

    debian/control: add the Homepage field
    
    Closes: #798056

[33mcommit d088a62dcd17a50399d382220a01d4003358fd3c[m
Author: Marco d'Itri <md@linux.it>
Date:   Sun Dec 20 19:22:52 2015 +0100

    Add a conflict with mksh
    
    See: #807185

[33mcommit 717fb98f72218375c88de3916266b905fea2b457[m
Author: Marco d'Itri <md@linux.it>
Date:   Thu Aug 6 01:42:39 2015 +0200

    Fix the Vcs-Git URL

[33mcommit f370692f4c9eeee560b02226614246cfeac75397[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Aug 5 05:10:02 2015 +0200

    Debian changelog for 2

[33mcommit f2e5dc2d66b800490fb7369101218b5d1d32d933[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Aug 5 05:01:07 2015 +0200

    dpkg.cfg: remove debianutils
    
    See #767924.

[33mcommit 8610966026effc620bf140098dfe0149bc6632d3[m
Author: Marco d'Itri <md@linux.it>
Date:   Wed Aug 5 04:57:58 2015 +0200

    dpkg.cfg: remove nano
    
    See #767929.

[33mcommit 0da7659cb148a5d086fa265555c89ac7a527e9ee[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Aug 3 22:43:26 2015 +0200

    Gracefully handle EBUSY when renaming the directories

[33mcommit 1d8d7d7a6255e8072dcee3286e456480aa6486a0[m
Author: Marco d'Itri <md@linux.it>
Date:   Mon Aug 3 04:10:06 2015 +0200

    Convert the symlinks in a second pass after regular files
    
    Or else, if the program fails it may leave the system in an inconsistent
    state because a symlink has been moved to /usr and replaced by the
    temporary symlink, e.g. from /bin/sh to /usr/bin/sh, but the actual
    program to which the symlink points to, in this case /bin/dash, has not
    been moved yet to /usr.

[33mcommit f683a8817f3785334206b2de506ba912f166797a[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Aug 1 20:09:09 2015 +0200

    Create missing directories in /usr/
    
    e.g. /usr/lib64/ may not exist.

[33mcommit 1abdb480173114307e3d20c28c38d7e7a245206e[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Nov 8 05:47:41 2014 +0100

    Add a TODO list

[33mcommit a5cf3e3ab092abbab0d79ca252530624cc97f947[m
Author: Marco d'Itri <md@linux.it>
Date:   Fri Nov 7 04:49:58 2014 +0100

    preinst: check if /usr is a standalone filesystem

[33mcommit 1997edf3874e0a9b114736e69e3dd776541a3e0e[m
Author: Marco d'Itri <md@linux.it>
Date:   Tue Nov 4 22:45:27 2014 +0100

    Add a conflict with zsh
    
    See #768079.

[33mcommit fa376fd58e862d90501a61bc3c74bf48bfa8a25b[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Nov 1 22:00:16 2014 +0100

    Code imported

[33mcommit c1210eb2aadb2632cc23296d9423e5e7abb3d055[m
Author: Marco d'Itri <md@linux.it>
Date:   Sat Nov 1 16:54:02 2014 +0100

    Initial commit
